Some CSS cleanups and PBTech improvements