Remove hard coded location, added icon