diff --git a/js/CommonComponents.js b/js/CommonComponents.js
index f562bb3..2f1e057 100644
--- a/js/CommonComponents.js
+++ b/js/CommonComponents.js
@@ -44,7 +44,7 @@ export class TurniereNavigation extends React.Component {
                 <Betabadge/>
                 <NavbarToggler onClick={this.toggle} />
                 <Collapse isOpen={!this.state.collapsed} navbar>
-                    <Nav navbar>
+                    <Nav navbar className="mr-auto">
                         <Navlink target="/create" text="Turnier erstellen"/>
                         <Navlink target="/list" text="Öffentliche Turniere"/>
                         <Navlink target="/faq" text="FAQ"/>
@@ -58,14 +58,14 @@ export class TurniereNavigation extends React.Component {
 
 function Navlink(props) {
     return (
-        <NavItem>
+        <NavItem active={true}>
             <NavLink href={props.target}>{props.text}</NavLink>
         </NavItem>
     );
 }
 
 function Betabadge() {
-    return (<Badge color="danger">BETA</Badge>);
+    return (<Badge color="danger" className="mr-2">BETA</Badge>);
 }
 
 function LoginLogoutButtons() {
diff --git a/pages/index.js b/pages/index.js
index f57e62b..fd2a273 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -41,7 +41,7 @@ const Index = (props) => {
 
 function Main() {
     return (
-        <div>
+        <div className="main">
             <Marketing/>
             <MainPromotedLinks/>
             <MainBottomSummary/>
@@ -86,7 +86,7 @@ function Marketing() {
 
 function Betawarning() {
     return (
-        <Alert color="danger" className="shadow-sm mt-4">
+        <Alert color="danger" className="shadow-sm mt-4" fade={false}>
             <h4 className="alert-heading custom-font">Public Beta</h4>
             <p>
                 Diese Website ist noch in der Entwicklung.<br/>
diff --git a/static/everypage.css b/static/everypage.css
index f851ea6..0d64bd7 100644
--- a/static/everypage.css
+++ b/static/everypage.css
@@ -43,6 +43,6 @@ footer {
     border-bottom-left-radius: .25rem !important;
 }
 
-main {
+.main {
     padding-bottom: 5em;
 }
\ No newline at end of file