Layout Updates

Format fix and styling updates.