Removed per window layout, massive cleanup