ui fixes and changes
resolved merged
added back sdk into tree