Changed view layouts-showing titles instead of ID
Commit - nothing - weird error
Merge branch 'Master2' into test_smidt
Merge branch 'test_smidt'