added measures warning, few ui enhancements