Improve visuals & layout (#2091)