Added basic widget stuff