custom css FOS and edit user page
fix merge
fix merge