reorganize views a bit