Fix frontend
Prepare for backend