Removed hardcoding from UI input