Added few icons, refactored JS