Changed some config files and layout