Fixed some css issues and redesigned the popup selectors.