Restyling and reorganizing for analyze 1 col feature - in progress