Port over the UI features