WIP: Various Frontend Fixes