better layout markup and styling