Major chagnes to the layout
Major changes to the config