Changed layout to use API objects