layout xml
Repaired conflicts, added Jackson library because it was missing for
some reason