Set the layout back to default once we've built the gateway view
Merge branch '1.2/develop' of https://github.com/firesale/firesale into 1.2/develop