general fixes to layout project