Added new navigation drawer icons

Also did some heavy refactoring to remove redundant code