Additional links in pages, Servlet refactors and Bug Fixes.

[gundermanc]

General house keeping tasks.

Going to clean some things up and condense others, add some integration between some UI components, perhaps additional test cases.