Feat/display tweaks