added borders for xterm and new layout control