major improvements on the ui