More work. Corrected icons, improve usability, etc...