Cleaned up input logic in all views