Looked over layout-functions.sh. Minor improvements.