fixing some problems wiith maps and UX