Fixes and new frontend feature