many UI and logic fixes for pilot experiment