reformatted some layout