css working
combined working on css & josh's edits