fixes on new layout