clean up code and add bubble selected color