Convert to SMACSS & Add more functionality