Fixing some CSS and JS issues