working out the logic to switch btween views
Merge branch 'master' of github.com:fhacktory/aperitif