Simplifying the UI a bit