final GUI changes, few bugs fixed
conflict resolved