finalized layout
merged with master