Fixed UI implementation