Frontend Fixes

Fixes Issues:
#2865
#2891
#2902
#2857