Correction of mixed up branches
Various bug fixes
Addition of Menu Widget