ADD: Connect Class; MOD: Frontend-Layout