Frontend Fixes

Fixes issues:

#2523