diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
index 74a4eb0050..57166ece9d 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
@@ -1,9 +1,9 @@
 //@flow
 import React from "react";
-import type {Changeset, Repository} from "@scm-manager/ui-types";
-import {Button, ButtonAddons} from "../../buttons";
-import {createChangesetLink, createSourcesLink} from "./changesets";
-import {translate} from "react-i18next";
+import type { Changeset, Repository } from "@scm-manager/ui-types";
+import { ButtonAddons, Button } from "../../buttons";
+import { createChangesetLink, createSourcesLink } from "./changesets";
+import { translate } from "react-i18next";
 
 type Props = {
   repository: Repository,
@@ -21,7 +21,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
     const sourcesLink = createSourcesLink(repository, changeset);
 
     return (
-      <ButtonAddons className="level-item">
+      <ButtonAddons className="is-marginless">
         <Button link={changesetLink} className="reduced-mobile">
           <span className="icon">
             <i className="fas fa-exchange-alt" />
diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js
index 6de47f0c87..1180bc1c50 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js
@@ -1,16 +1,16 @@
 //@flow
 import React from "react";
-import type {Changeset, Repository} from "@scm-manager/ui-types";
+import type { Changeset, Repository } from "@scm-manager/ui-types";
 
 import classNames from "classnames";
-import {Interpolate, translate} from "react-i18next";
+import { Interpolate, translate } from "react-i18next";
 import ChangesetId from "./ChangesetId";
 import injectSheet from "react-jss";
-import {DateFromNow} from "../..";
+import { DateFromNow } from "../..";
 import ChangesetAuthor from "./ChangesetAuthor";
-import {parseDescription} from "./changesets";
-import {AvatarImage, AvatarWrapper} from "../../avatar";
-import {ExtensionPoint} from "@scm-manager/ui-extensions";
+import { parseDescription } from "./changesets";
+import { AvatarWrapper, AvatarImage } from "../../avatar";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
 import ChangesetTags from "./ChangesetTags";
 import ChangesetButtonGroup from "./ChangesetButtonGroup";
 
@@ -26,21 +26,22 @@ const styles = {
   },
   avatarFigure: {
     marginTop: ".25rem",
-    marginRight: ".5rem",
+    marginRight: ".5rem"
   },
   avatarImage: {
     height: "35px",
     width: "35px"
   },
-  isVcentered: {
-    marginTop: "auto",
-    marginBottom: "auto"
-  },
   metadata: {
     marginLeft: 0
   },
-  tag: {
-    marginTop: ".5rem"
+  isVcentered: {
+    alignSelf: "center"
+  },
+  flexVcenter: {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "flex-end"
   }
 };
 
@@ -65,61 +66,65 @@ class ChangesetRow extends React.Component<Props> {
 
     return (
       <div className={classes.changeset}>
-        <div className="columns">
+        <div className="columns is-gapless is-mobile">
           <div className="column is-three-fifths">
-
-            <h4 className="has-text-weight-bold is-ellipsis-overflow">
-              <ExtensionPoint
-                name="changeset.description"
-                props={{ changeset, value: description.title }}
-                renderAll={false}
-              >
-                {description.title}
-              </ExtensionPoint>
-            </h4>
-
-            <div className="media">
-              <AvatarWrapper>
-                <figure className={classNames(classes.avatarFigure, "media-left")}>
-                  <div className={classNames("image", classes.avatarImage)}>
-                    <AvatarImage person={changeset.author} />
+            <div className="columns is-gapless">
+              <div className="column is-four-fifths">
+                <h4 className="has-text-weight-bold is-ellipsis-overflow">
+                  <ExtensionPoint
+                    name="changeset.description"
+                    props={{ changeset, value: description.title }}
+                    renderAll={false}
+                  >
+                    {description.title}
+                  </ExtensionPoint>
+                </h4>
+                <div className="media">
+                  <AvatarWrapper>
+                    <figure
+                      className={classNames(classes.avatarFigure, "media-left")}
+                    >
+                      <div className={classNames("image", classes.avatarImage)}>
+                        <AvatarImage person={changeset.author} />
+                      </div>
+                    </figure>
+                  </AvatarWrapper>
+                  <div className={classNames(classes.metadata, "media-right")}>
+                    <p className="is-hidden-touch">
+                      <Interpolate
+                        i18nKey="changeset.summary"
+                        id={changesetId}
+                        time={dateFromNow}
+                      />
+                    </p>
+                    <p className="is-hidden-desktop">
+                      <Interpolate
+                        i18nKey="changeset.shortSummary"
+                        id={changesetId}
+                        time={dateFromNow}
+                      />
+                    </p>
+                    <p className="is-size-7">
+                      <ChangesetAuthor changeset={changeset} />
+                    </p>
                   </div>
-                </figure>
-              </AvatarWrapper>
-              <div className={classNames(classes.metadata, "media-right")}>
-                <p className="is-hidden-mobile is-hidden-tablet-only">
-                  <Interpolate
-                    i18nKey="changeset.summary"
-                    id={changesetId}
-                    time={dateFromNow}
-                  />
-                </p>
-                <p className="is-hidden-desktop">
-                  <Interpolate
-                    i18nKey="changeset.shortSummary"
-                    id={changesetId}
-                    time={dateFromNow}
-                  />
-                </p>
-                <p className="is-size-7">
-                  <ChangesetAuthor changeset={changeset} />
-                </p>
+                </div>
+              </div>
+              <div className={classNames("column", classes.isVcentered)}>
+                <ChangesetTags changeset={changeset} />
               </div>
             </div>
-
           </div>
-          <div className={classNames("column", classes.isVcentered)}>
-            <ChangesetTags changeset={changeset} />
-            <div className="is-pulled-right level">
-              <ChangesetButtonGroup repository={repository} changeset={changeset} />
-              <div className={classes.isVcentered}>
-                <ExtensionPoint
-                  name="changeset.right"
-                  props={{ repository, changeset }}
-                  renderAll={true}
-                />
-              </div>
-            </div>
+          <div className={classNames("column", classes.flexVcenter)}>
+            <ChangesetButtonGroup
+              repository={repository}
+              changeset={changeset}
+            />
+            <ExtensionPoint
+              name="changeset.right"
+              props={{ repository, changeset }}
+              renderAll={true}
+            />
           </div>
         </div>
       </div>
diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetTagBase.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetTagBase.js
index 7fc8dabcd2..a62c6292a3 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetTagBase.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetTagBase.js
@@ -4,9 +4,6 @@ import injectSheet from "react-jss";
 import classNames from "classnames";
 
 const styles = {
-  tag: {
-    marginTop: ".5rem"
-  },
   spacing: {
     marginRight: ".25rem"
   }
@@ -24,7 +21,7 @@ class ChangesetTagBase extends React.Component<Props> {
   render() {
     const { icon, label, classes } = this.props;
     return (
-      <span className={classNames(classes.tag, "tag", "is-info")}>
+      <span className={classNames("tag", "is-info")}>
         <span className={classNames("fa", icon, classes.spacing)} /> {label}
       </span>
     );