Added toolbar and morphing control