fine tune user page
manual merge