Minor UI improvements and added tooltip support