Profile page better. Not quite finished yet
merge