Styles update and little bug fix
Merge branch master