Annother attempt to fix broken look