Closes #615
Closes #630
Now screen will look like this: 
This avoid confusion between similar names of course editions. I also tried step by step approach (different pages), but this one is cleaner as it doesn't enforce additional pages and it's easy to change the course if you made a mistake.
