Fixed many bugs and UI changes.  Also added Surveys

Fixed Many bugs
Made UI easier to use
Added some new features