merged working ui, and process
merging my changes with most recent
Merge pull request #1 from CIS642/merged_ui_and_process

Merged ui and process and recent changes