Misc. cleanup and tweaks for small device views