Few improvements on SAMS page