More styling and some changes to models