changed to more basic layout