simplifying config
moved layout to the top