Move add spot button up.  Clean up code. Add comments.