Theme and naivgation fixes/tweaks