improving draft layout
improving layout and sizing