Make things pretty
new layout
merge master
Fix fix