change the main gui form
conflict resolved
Merge branch 'dilini-mampitiya-master'
conflict resolve