fix last bugs on frontend

fix few bugs