Added status and tools windows