Fixed issues with collection view layout, added missing schemes