Added more beautification to scaffold pages