Rewrite to use JInput in Layouts