Fix layout for building details
Refactor xml layout to use table