Various improves to the user interface