Refactored CircularButton a little and improved addition