new markers and a few extra UI changes