Comply with formatting guideline, added icon styling, fixed #35