Fix: Buttons and lists