Cristian: added UI and old JS work