Layout Updates & Tax Creator