Variety of interface tweaks, optimized some code