Removed a bug. Seperated data structure from display