* Fix a couple of mismatched info.json layout names * Fix layouts * Clean up layouts
Co-authored-by: Ryan <fauxpark@gmail.com>