Fix UI pages for new layout