Really fix buttons this time