Some changes
Displaying stuff properly