other bug and layout fixes