Cleaned up the tracker template
Added search