small fixes and UI lollipop preparation