Add configurable.phtml & some edits