Defined data model & more UI changes

Added data model
change UI to make consistent
cleaned out code