diff --git a/pagure/themes/srcfpo/templates/group_info.html b/pagure/themes/srcfpo/templates/group_info.html
index 20d66d6..4f7f11b 100644
--- a/pagure/themes/srcfpo/templates/group_info.html
+++ b/pagure/themes/srcfpo/templates/group_info.html
@@ -86,7 +86,7 @@
 
             {% if g.authenticated and (member or g.admin)
                   and config.get('ENABLE_GROUP_MNGT') %}
-            <div class="list-group-item" id="add_user_form_wrapper" style="display:none;">
+            <div class="list-group-item hidden" id="add_user_form_wrapper">
               <form action="{{ url_for('ui_ns.view_group', group=group.group_name)
                 }}" method="post" id="add_user_form">
                   <input placeholder="search for user" class="form-control" id="user" name="user" title="User name"/>
@@ -104,7 +104,7 @@
               {% if g.authenticated and user != group.creator
                     and (member or g.admin)
                     and config.get('ENABLE_GROUP_MNGT') %}
-               <form class="float-right" method="POST" style="display: inline-block"
+               <form class="float-right inline-block" method="POST"
                 action="{{ url_for('ui_ns.group_user_delete',
                     group=group.group_name, user=user.user) }}">
                 {{ form.csrf_token }}
diff --git a/pagure/themes/srcfpo/templates/repo_branches.html b/pagure/themes/srcfpo/templates/repo_branches.html
index 4ca6224..a606288 100644
--- a/pagure/themes/srcfpo/templates/repo_branches.html
+++ b/pagure/themes/srcfpo/templates/repo_branches.html
@@ -5,7 +5,7 @@
 {% set tag = "home" %}
 
 {% block header %}
-<style>
+<style nonce="{{ g.nonce }}">
 .disabled_branch a {
   color: #818a91;
 }
diff --git a/pagure/themes/srcfpo/templates/repo_info.html b/pagure/themes/srcfpo/templates/repo_info.html
index c9d07aa..889471d 100644
--- a/pagure/themes/srcfpo/templates/repo_info.html
+++ b/pagure/themes/srcfpo/templates/repo_info.html
@@ -20,7 +20,7 @@
 
 {% block header %}
     <meta name="go-import" content="{{ config.get('APP_URL', '').split('://', 1)[1] }}{{ repo.fullname }} git {{ config.get('GIT_URL_GIT') }}{{ repo.fullname }}.git">
-<style>
+<style nonce="{{ g.nonce }}">
   a.koji button {
     padding-left: 20px;
     background: url({{ url_for('theme.static', filename='icons/koji.png')}}?version={{ g.version}}) 0 50% no-repeat;
@@ -48,6 +48,9 @@
     white-space: -o-pre-wrap;    /* Opera 7 */
     word-wrap: break-word;       /* Internet Explorer 5.5+ */
   }
+  .maintainers_dropdown {
+    width:500px;
+  }
 </style>
 {% endblock %}
 
@@ -260,7 +263,7 @@
                                         repo.contributor_groups['ticket']|length + 1 %}
                   <span class="btn btn-sm btn-primary font-weight-bold">{{ memberstotal }}</span>
 
-                  <div class="dropdown-menu dropdown-menu-right" style="width:500px">
+                  <div class="dropdown-menu dropdown-menu-right maintainers_dropdown">
                     <div>
                       <div class="media p-2">
                           <img class=" align-self-center mr-3" src="{{ repo.user.default_email | avatar_url }}" width=50px height=50px>
@@ -396,7 +399,7 @@
                 namespace=repo.namespace,
                 commitid=commit.hex, branch=branchname) }}"
                 class="notblue">
-                <code style="font-size: 1em;background: #ddd;" class="py-1 px-2 font-weight-bold">{{ commit.hex|short }}</code>
+                <code class="py-1 px-2 font-weight-bold commit_hash">{{ commit.hex|short }}</code>
                 <span class="font-weight-bold">{{ commit.message.split('\n')[0] }}</span>
               </a>
             </div>
diff --git a/pagure/themes/srcfpo/templates/repo_master_sidebar.html b/pagure/themes/srcfpo/templates/repo_master_sidebar.html
index 265946a..154fa63 100644
--- a/pagure/themes/srcfpo/templates/repo_master_sidebar.html
+++ b/pagure/themes/srcfpo/templates/repo_master_sidebar.html
@@ -66,7 +66,7 @@
   </a>
 
   {% if 'distgit_ns' in g.main_app.blueprints and not repo.is_fork %}
-  <div class="col-xs-2" style="height:1em;"></div>
+  <div class="col-xs-2 line-height-1"></div>
   <p>Monitoring status:</p>
   <div class="btn-group">
     <a href="#" title="Monitoring status"
@@ -111,7 +111,7 @@
 
   {% if g.authenticated and repo.user.user == "orphan" %}
   <div id="take-orphan-section">
-    <div class="col-xs-2" style="height:1em;"></div>
+    <div class="col-xs-2 line-height-1"></div>
     <p>Orphaned:</p>
     <div class="btn-group">
       <a href="#" title="Adopt this orphaned package"