Add welcome page + fix app page