Simplification of UI, added JSON support code