Ui integration

updated:
- spaces instead of hard tabs
- name for variables
- split of methods where lines code were more than 25 lines.