Working on layout
merged __ben features