Improved the layout of segments by removing meta stuff