Feature/widget design

Widget improvements. Merge, but don't kill the branch.