Major site refactor and additions