Made more pretty and functional