Pierre's Fixes with css