Fixes and new widgets
Merge branch 'master' of github.com:shimmerproject/Albatross