Fix connect and CSS fix #6