Feature/cleanup

A cleanup of the app
Stop forgetting about subscriptions, minor accessibility changes.