Added popup component, revolves #247