More UI updates, commented out buggy javascript