style sheet stuff
style sheet merge fix