Few small updates to window properties and table updates