New widget + bug fixes