Added home page and fixed settings