Rebuilt display functionality