minor layout improvements and more accurate perf