More styling!! Bug fixes!!