Minor layout tweeks
Cleanup