Revising the launcher icons, reorganizing stuff, and merging
functionality into a single activity, for now.