More work done to the root comment UI + buttons