CSS updates to bring styles back closer to original design