Updated to use CSS