Merge pull request #64 from himleyb85/ui

more ui
forms now working
merged with master