Fix things and more styling