Research fix and CSS fix