Minor bug fix and view improvement