GUI changes

Change-Id: I906f5cc099c5f4a044537171db3df9193608a0d5
Signed-off-by: Andrey Shamis <lolnik@gmail.com>