more fixes for updated layout