Improved button layout, using foldout