Minor corrections
More work on module-selector
More work on buttons