add screenlayouts
various minor updates