Removed footer
Improved remove function
Check if nil before displaying