Added more elements to liability page class
Resolved conflicts