Fixing some design issues
Fixing urls