* Fixed layout; implemented submit
* Cleanup and package renaming
* Merging