Move UI into the content area, and add support for Firefox