Front end improvements and add dynamic lesson number