More work on topics of the app