minor fixes to layouts and controllers