cleaned up default layout