[#609] Final fix on layout