cleaned up display activity, almost finished