Further small changes to frontend