more changes on matrix UI