Further changes to UI and added icon.