Update for more single page architecture.
Updated to handle adding new elements
Merge branch 'account_feature'