gui update
GUI update
Merge remote-tracking branch 'test/master' into test
Refactoring views and JS