integrating changes and styling fixes