Tidied WelcomePage code

and tried to run all from Controller. UI has gone a runner though
currently.