cleand up map and added some used feature to the top bar