Tidying site up, work needed on navigation still