Various improvements in all pages