finally got layout right