Layout fix and post refactored