Add orderby to Fasade
Fixed some bugs with screens