Refactor and make selection section more obvious