fix ui and added travis support
merge