reorganised file. divided into separate tasks
lastest ui changes
Merge branch 'master' into ui_changes