Refactoring of layouts + added about and contact page