fixed issues with frontend