some styling changes, tried to get the stat working
fix conflict