diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..05b59d3
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,27 @@
+name: Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+      
+    - name: Update repository
+      run: sudo apt-get update -y
+      
+    - name: Install the basic dev packages
+      run: sudo apt-get install -y equivs curl git devscripts lintian build-essential automake autotools-dev cmake g++
+      
+    - name: Install build dependencies
+      run: sudo mk-build-deps -i -t "apt-get --yes" -r
+      
+    - name: Build
+      run: mkdir build; cd build; cmake .. ; make -j$(nproc);
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c01c45..ab46e05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt5 COMPONENTS Core DBus Quick LinguistTools REQUIRED)
-find_package(FishUI REQUIRED)
+# find_package(FishUI REQUIRED)
 
 find_package(KF5KIO)
 find_package(KF5Solid)
@@ -57,7 +57,7 @@ target_link_libraries(cutefish-filemanager
   KF5::KIOWidgets
   KF5::Solid
 
-  FishUI
+  # FishUI
 )
 
 file(GLOB TS_FILES translations/*.ts)
diff --git a/qml/FolderListView.qml b/qml/FolderListView.qml
index cae64ea..dc517c7 100644
--- a/qml/FolderListView.qml
+++ b/qml/FolderListView.qml
@@ -410,6 +410,16 @@ ListView {
             verticalAlignment: TextEdit.AlignVCenter
             z: 999
 
+            background: Item {
+                Rectangle {
+                    anchors.fill: parent
+                    anchors.topMargin: FishUI.Units.smallSpacing
+                    anchors.bottomMargin: FishUI.Units.smallSpacing
+                    radius: FishUI.Theme.smallRadius
+                    color: FishUI.Theme.backgroundColor
+                }
+            }
+
             property Item targetItem: null
 
             onTargetItemChanged: {
diff --git a/qml/FolderPage.qml b/qml/FolderPage.qml
index f8ac290..3e1382d 100644
--- a/qml/FolderPage.qml
+++ b/qml/FolderPage.qml
@@ -281,7 +281,7 @@ Item {
             topMargin: FishUI.Units.smallSpacing
             leftMargin: FishUI.Units.largeSpacing
             rightMargin: FishUI.Units.largeSpacing
-            bottomMargin: FishUI.Units.largeSpacing
+            bottomMargin: FishUI.Units.smallSpacing
             spacing: FishUI.Units.largeSpacing
 
             onCountChanged: {