A few modifications to the new layout