improved layout
layut improvements