More frontend changes. Hopefully didn't break anything.