Merged with maxwen's new layout design.