updated in place editing and added yello fade in