Will hold mimic function logic
cleaning up UI
minor changes