Slight interface tweaks, easier access to pic