Added UI and minor changes.