Added icons to dropdown menu, refactored menu code