Updated style
Fixed some stuff
First version of new design