Fixes as per css changes