Cleaned up code, still need resource fix for images