Clean up from chaning keywords dialog to an activity.
Bug fix #33. Minor refactoring, finishing up with some cleanup from
changing keywords dialog to an activity.