#491 better layout