Update UI
conflicts
[FREE][UI] Changing UI

Signed-off-by: bruno.carvalho <bruno.carvalho@lge.com>