modiefied layout
cleaned up