Action button fixes in multiple screens