Genres adding
unit tests
Unit tests. UI fixes
merge