Fixed Login and added Map