More layout tweaking
First post near complete