Stack categories, UI update and optimizations