Merge pull request #1341 from pennij/working_mon0520

Fixed merge conflict for #1329
added properties and left-nav