Fixed UI and viewer.