doing some work on the layout
merging my earlier layout fixes and the post upload batch