add simplex and cleaned up the ui
resolving conflcts
Merge branch 'JamesMura-new_look'