minor changes
fixed conflicts in custom.css file