CSS fixes and widget inclusion change