More module to footprint UI fixes.