updates to layouts, minor changes