Update the UI, looks much better now