updated to use layouts
reformatting
reformatting