Revert "curve layout"

This reverts commit e86a768f93b6f786d34554a759977fdf59fd33aa.