Modal now has scrolling
Several commands, UI rework