improving the UI, major change