Added lesson types
Minor GUI fixes