Null/emptyList checks in views
BootStrap modifed for production