Added some icons and refactored some more.