Using partial form where appropriate