Refactoring Menu #2, Removed Button & Label Class
Merge remote-tracking branch 'origin/master'