Redesigned site layout, added event tests and cleaned up code