marc's revamp of layout
adding some layouts