Add vertical option, some layout improvements