Improved UI slightly