fixed grey and margin at bottom
Merge branch 'master' into development_a