Restyled a bit more