Moved some markup to css.