Reafactoring. Adding widgets is now more decent.