Changed layout to fit packaging