Namespace components

To remove globals. Also tidy up markup/css