Improve listing layout