Fixed update bug and switched button places