Initial pages and functional controllers v1
Merge branch 'albert' into common