added map views and better user handling