fixes for new layout