Fix button size and restore edit button