Merge enterdata with master

Finished all required enter data functionalities.