Tidy up of web page starting conditions
Tidying start/stop conditions