Fixed Make install
Fixed Fixtures
Fixed Layout