UI Work.
Javascript refactoring.