Make layout selectable from command line

Note: bottom-up is still broken