Usage pv handling fix + layout update