Updated the screen layouts and templates.