Stripped out template code.
Started JAAS setup.
Some layout work to main page/header etc