Frontend fixes

This fixes several issues on the frontend side