minor tweaks
final layout toucher