Simplify and Fix Action Buttons