Cleaned up links and javascript