Refactoring and AboutPanel added