CSS improvements
More css fixes