fixed topbar hiding text + refactored map.jade to screens