Fix button and routes