updated layout considerably improved