Update lexie's branch with touch control nav