huge changes in the ui