major layout fix, stats fix