Improved Layout and Index page