finishing up frontend