Slight Modifications to UI

Working on changing the workflow