Felix's layout updates