Commented out much of layout