Changed layout and config file