Updated some layouts and settings