layout changes, added map