general layout fixes