Moved combo view logic to one function