fixed all bug except to show profile form
I think I fixed all the bugs
fixed comflict