Moved selectors to vars and added topbar to selector