Changed from grid layout to HBox