Made hilight button more modular