rename all components to follow convention
changed color selector to inline-block