more changes in layout etc.
fix typo
fix typo