user front end done, still some clean up to do
quick fix