Removed unused icons
Refactored view