fixed new layout conflicts and other minor changes