Recalculated the baseline and added some utility classes