E:42617 [*] Small design changes
[-] Remove obsolete controller's action