Made things look a bit better