Added Data-Fixtures, some Minor Changes, and provided a layout