Various fixes and new views mostly related to the study flow