Reorganised display

Removed condition as it wasn't useful.