refactoring demo activities to be cleaner/more readable, re-enabling the activity buttons