Working on styles bugs and other stuff
Differents bugs resolved