Update goals
Add simple meta titles and some refactoring