Fix frontend a bit