Struktur changed, Controller class modified, UI revised