CSS and minor code e tweaks