changed controller name to TOP AREA, and fixed some compilation errors after the merge