More changes to test gestures layout & main code