Fix button ordering