Moved to single layout view