edit task panel wasn't appearing right, reverted
more merge conflicts