Addressed layout issues in windows.