Frontend Fixes