Updating other layouts, misc fixes