lots of UI work, finished some js stuff