Added support for right-aligned labels