Fix small css, improved ui ^^
Merge remote-tracking branch 'origin/master'