addded menu icon and refactored some JS