Tried to make a less cluttered layout