Page layout fixes

Page layout fixes