Enable editing Profile and major bug fixes