Looks much better now