added style for highlight
added new functionality, refactored code