Added the 'base' component
Design changes