Fixing some not properly working buttons and routes.