Fix button order