edit bugs fixed and toggle view