Added a bit of CSS and other sall improvements
Added a bit of CSS and other sall improvements
Merge origin/master