Minor bugfixes

Bugfixes across app, and organised home fragment in a better way.