Some fixes to navigation button behavior; added search arrow when on lockscreen