changed layout to make it simpler