Fixing the preferences UI - Buttons & Overflowing menu sections

To reproduce:

• Click on the edit option
• Select preferences from the list