controller gestures and styling
conflicts
final version