reworked the basic layout