changes in layout and code