add layout page functionality
allow action to change view
rename Action to Activity (action has another meaning)
Merge remote-tracking branch 'origin/master'