Cleaning up and fixing bugs

Fixed the xs issue by providing 12 col defaults