Minor tweaks
Fixed merge conflicts Friday evening
Can now choose genres and display list of apps in that genre