Ugly (but working). CSS updates required