Updated page with a better layout