Fixed the miss-alignment by adding the correct classes.
Cleaned up the method to rather use string interpolation.