Issue #297 Buttons layout changes