adding of shapes improved and editmode removed