some improvement in layout