Added remove buttons layout