updated layout. other minor fixes.