Okay made it slightly less ugly...