merged minor changes from dev

adjustments made on margins