continue working on selection popup. fixed theme on fs/bs