tidying up command line options and controller
More for automatic layout