Fixed conversation view + small fixes