Fixes to folder titles, cleaned up properties