Merge pull request #28 from FlappyMappy/UIFeatures

Bug fixes, templated info window
fix merge conflicts
hopefully fix terrible bugs that broke everything
fix merge conflicts
finally fix merge conflicts