UI fixups and code cleanups for touch actions