Issue #297 More on button layouts