Better presentation logic