Plugs, small frontend changes, renamed class methods