Broader click area, formatting

Broader click area, formatting