Fixed layout issue for CLI application