Login UI working + shim

Conflicts:
	package.json