Frontend Fixes

Additionally fixes part 1 of #3028