Some better presentation, line up map window, functionality improvements