Reworked CSS for redeability sakes