Fix namings and some finicky layout stuff