Arranged views a bit more sanely