Extracted the big EditInfoController to a few smaller ones
Added university area layout