Refactored the names of components. Their names should give tell what
they are now. Also fixed image placement to always place in middle.