Custom layout

simple changes to start using custom layout