Web UI ready to be merged to Master

Tests passing & functionality working. Ready to be merged to Master