removed logout and moved map