Frontend Fixes

Fixes issues:

#2523
#2976
#2939