Fix connect and CSS fix #5