Changes to content key parsing

Decoupled loading content of layout file and parsing keys out of it.