Slight layout cleanup, still ugly, but less I suppose