refactored code based on sass framework and tooltip changes