Added CLI options and vertical splitting