Added Settings module
Updated settings and loading a layout