Refactored ActionPanel to MVC