Refactor and more widgets