Fix split view controller behavior
Minor changes