Refactor
Add widgets. Bad architecture =(