Committing latest updates to UI and basic functionality for Project 1 demo