Adeora

Changes from adeora - added pages, reworked nav, etc.

Ready to merge branches and add the upload system.