Fix small mistakes in fire prompt
Fix bugs introduced by previous commit.
Added remaining widgets