Added UI scaffolding
Resolve merge conflicts
Finished resolving merge conflicts
Removed extraneous files