Add updated Angular from Jos's commit
Add layout from Jos's pull
Add config from Jos's pull