Cleanup code a bit. Options view minor update.