updated some of the frontend

Final push before testing and debugging