BB10 UI improvment + bugfixes