Layout fixes

- Fix off by 1 alignment error. 
- Compress image layout space.