General structure and UIX improved.