reworked basic layout