Improving base template, adding home page