Restructured activities
separates activity and rendering