Refactored Action Layer into Action and UI