changes
merged marty layout fixes in