More contracts 2.0, some aesthetic updates