Added UI stub, improved JS