refactored from latest UI from bubblebathbay
refactored from latest UI from bubblebathbay