Build verions 3.1.0. UI fix and UX improvements