fixed layout buttons
Merge branch 'marlena'