Basic layout
Split diff functionality