i) Added Entities in Data model
ii) Cleaned up UI to kick start UI.