cleaned up default layout more