Fix frontend after restructure