reworked the default layout