refactored default layout