filling in layout and cleaned up spec files