Fixed displaying issue
Collecting ideas for next task