Small fixes and basic form
Merge pull request #10 from kknavs/master

Very basic form and some visual fixes...