Fixes from 1.5.6.X branch + button style update

Fixes from 1.5.6.X branch + button style update