Improved modularity, added random option to settings pane