crud and style tweaks