Performance/layout fixes