making user function again with new funcionalities and fixin some activity flow