Layed out more of new design