Change type for Connection. Change rate functionality. Need ID to pass to rate. Refactor layouts