Layout fix, Camera context menu fix