Final Changes to App, Fixed alignment issues and Re-linking of Pages.