Ready for Display, need to fix some codes though
Merge branch 'AddingMoreDisplay'