diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf
index df60d06..0cdb1e0 100644
--- a/rootfs/etc/supervisor/conf.d/supervisord.conf
+++ b/rootfs/etc/supervisor/conf.d/supervisord.conf
@@ -18,9 +18,9 @@ stderr_logfile=/dev/fd/1
 stderr_logfile_maxbytes=0
 
 [group:x]
-programs=xvfb,lxpanel,x11vnc,novnc,cloud9
+programs=xfce4,xvfb,x11vnc,novnc,cloud9
 
-[program:lxpanel]
+[program:xfce4]
 priority=15
 directory=%HOME%
 command=/usr/bin/startxfce4
@@ -34,7 +34,7 @@ stopsignal=KILL
 
 [program:x11vnc]
 priority=20
-command=x11vnc -display :1 -xkb -forever -shared -repeat -capslock
+command=bash -c 'x11vnc -ncache 10 -display :1 -xkb -forever -shared -repeat -capslock || rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb'
 
 [program:novnc]
 priority=25
diff --git a/rootfs/startup.sh b/rootfs/startup.sh
index 8aded33..677aaaa 100755
--- a/rootfs/startup.sh
+++ b/rootfs/startup.sh
@@ -127,10 +127,10 @@ mount -a
 mkdir -p /home/$USER/.config/gtk-3.0
 
 # Keep these bookmarks
-grep "file:///home/$USER/Documents" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Documents" >> /home/$USER/.config/gtk-3.0/bookmarks
-grep "file:///home/$USER/Workspace" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace" >> /home/$USER/.config/gtk-3.0/bookmarks
-grep "file:///home/$USER/Workspace/Shared%20Files" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace/-Shared%20Files-" >> /home/$USER/.config/gtk-3.0/bookmarks
-grep "file:///home/$USER/Downloads" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Downloads" >> /home/$USER/.config/gtk-3.0/bookmarks
+#grep "Documents" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Documents" >> /home/$USER/.config/gtk-3.0/bookmarks
+grep "Workspace" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace" >> /home/$USER/.config/gtk-3.0/bookmarks
+grep "Shared%20Files" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace/-Shared%20Files-" >> /home/$USER/.config/gtk-3.0/bookmarks
+grep "Downloads" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Downloads" >> /home/$USER/.config/gtk-3.0/bookmarks
 
 grep "127.0.0.1 archive.linux.duke.edu" /etc/hosts || echo "127.0.0.1 archive.linux.duke.edu" >> /etc/hosts