Frontend Template Changes / Added Remove Method