Mobile UI refactor, part II