little improvement on layout