Did all js and fixed ui stuff with marc