Main page OK and angularised