Updated layouts and styles