Improved UI, added cross validation