Pull Request James: Finalized Layout