Fix spacing; Improve performance on tab switching