fix layout minor issues