fixed no button and refactored selectors