UI updates, alert fixes
Merge branch 'ui' into Socket_Interfacing

Conflicts:
	public/javascript/main.js