Final Update before changes or px to em and %