Send page improvements

Send page UI improvements, this needs to be merged before #568

It includes required changes to:
 - Fix #485  
 - Fix #380