changed css to make it look right
Merge branch 'master' into development
changed css