Ugly ugly code, but bit of new look/simplification for site