Fixed up a few bad connections
Started workin on layout