Made more pretty and informative