Layout bug fixed
basic stats implemented
Major refactoring