activity and display fixes