Layout bugs fixed