VBox and HBox wrap for header
improved source view