Changed file locations, updated CSS