added wireframes+ interactions for android;cleanup of old code