Changing default port to 8694
Cleaning up Angular Branch

Merging new view styles into angular branch