Started home teasers and some refactoring