Unified Category and Search and cleaned-up layouts and includes