Refactored some code and icons, corrected text errors