Made the marker selection look better.
Finished up the beta