Added view switch icons, inelegantly, and implemented Section mode