Cleaned up layout files. Updated wind entry behavior (issue #1)