ticket:1 layout fixes