Consistent UI + fixed scrolling issues