Add some padding to UI response
Merge branch 'ui_change' into development