Modified UI slightly