Fix button and partial