lifting javascript class
merged master
revamped UI