changed layout to using table