Fixed/improved CSS