Updated extension full layout as per the nice mockup from @nonumber