removing test app and fixing issues in skin and states..and more clean up