Bug fixes.
Css fat finger.
Merge branch 'development'