User details, overview, slight reordering and general cleanup