update layout
resolve git conflicts @schechter