New icon for menu
Clean up: get_current_url
Changed form class to ID's.