Finishing map, final touches on UX