More tweaks and updated to the UI to use new changes