Added support for couplets and cleaned up styling