Fix connect and CSS fix #4