more updates the layout support to take a "-" to cleanup the code some, thanks cjolif for the suggestions.