Lollipop fixes + updated UI