Two widgets in one
code clean up / it's not updated properly
A little bit better
Code clean up