Renamed menu items
Used beans by generator
Whole application better structured