Next round of changes

almost finished with the layout.