Improve display layout