[FIX] Design cleanup: button ordering across the client