Adding spring security to the mix, starting to clean up templates...