Tidied up the UI a bit and grouped the changes to tables