Actually looks great now