Clean up CSS and Script a bit