Removed unused code plus final tweaks on controller appearance