Layout bugs fixed.