Reorganize views