teacher page + other fixes