Live sreen ui added. Some refactoring