Added delete functionality and a few tweaks to views