Last fixes and optim. for our UI

Change-Id: Id465721eb69660da71c7d531185d3dd8121df6be