Cleanup and tweak layout