added icon and some logic for changing location