improved Layout