Final Tidy Up

Some refactoring, added some comments
New baord test file with alternate CSS