Revert through "UI with all the activities"

This reverts 108fb8 and 2f3966.

Conflicts:

	A whole lot of files.