Less ugly
Just some look and feel
Merge branch 'feature/looknfeel'