Fixed display bugs
Merge