Layout and exceptions handling changes