Add window activity indicators
Fix some lint errors