Minor Layout Changes

Minor Layout Changes