updated styles, moved some stuff to model'